replace some more Clock() by ObsoleteSource redirect (and fix skin_default), by Morit...

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 135a45412deb60392c848253674c6fea62d42b1f..06aa859f6f5e2a705fcfc87a07d0b7cc854f5af4 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -47,7 +47,7 @@
                        <convert type="EventName">Name</convert>
                </widget>
                <ePixmap pixmap="skin_default/clock.png" position="483,329" zPosition="1" size="14,14" alphatest="on"/>
                        <convert type="EventName">Name</convert>
                </widget>
                <ePixmap pixmap="skin_default/clock.png" position="483,329" zPosition="1" size="14,14" alphatest="on"/>

-               <widget source="CurrentTime" render="Label" position="500,327" zPosition="1" size="50,20" font="Regular;19" halign="right" >
+               <widget source="global.CurrentTime" render="Label" position="500,327" zPosition="1" size="50,20" font="Regular;19" halign="right" >

                        <convert type="ClockToText"></convert>
                </widget>
                <widget source="ServiceEvent" render="Label" position="210,347" zPosition="1" size="340,20" font="Regular;19" halign="right" noWrap="1" >
                        <convert type="ClockToText"></convert>
                </widget>
                <widget source="ServiceEvent" render="Label" position="210,347" zPosition="1" size="340,20" font="Regular;19" halign="right" noWrap="1" >


@@ -216,7 +216,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
                <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#9f1313" transparent="1" />
                <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
                <ePixmap pixmap="skin_default/clock.png" position="452,13" zPosition="0" size="14,14" alphatest="on"/>
                <widget name="key_red" position="0,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#9f1313" transparent="1" />
                <widget name="key_green" position="140,0" zPosition="1" size="140,40" font="Regular;20" valign="center" halign="center" backgroundColor="#1f771f" transparent="1" />
                <ePixmap pixmap="skin_default/clock.png" position="452,13" zPosition="0" size="14,14" alphatest="on"/>

-               <widget source="Clock" render="Label" position="420,0" size="130,40" font="Regular;21" valign="center" halign="right" >
+               <widget source="global.CurrentTime" render="Label" position="420,0" size="130,40" font="Regular;21" valign="center" halign="right" >

                        <convert type="ClockToText">WithSeconds</convert>
                </widget>
                <widget name="timeline_text" position="0,41" size="560,20" />
                        <convert type="ClockToText">WithSeconds</convert>
                </widget>
                <widget name="timeline_text" position="0,41" size="560,20" />


@@ -503,7 +503,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget source="Event_Now" render="Progress" pixmap="skin_default/progress_medium.png" position="395,5" zPosition="2" size="71,11" borderWidth="2" borderColor="#cccccc" transparent="1" >
                        <convert type="EventTime">Progress</convert>
                </widget>
                <widget source="Event_Now" render="Progress" pixmap="skin_default/progress_medium.png" position="395,5" zPosition="2" size="71,11" borderWidth="2" borderColor="#cccccc" transparent="1" >
                        <convert type="EventTime">Progress</convert>
                </widget>

-               <widget source="CurrentTime" render="Label" position="500,1" size="55,28" font="Regular;20" halign="right" transparent="1" >
+               <widget source="global.CurrentTime" render="Label" position="500,1" size="55,28" font="Regular;20" halign="right" transparent="1" >

                        <convert type="ClockToText">Default</convert>
                </widget>
                <widget source="Event_Now" render="Label" position="5,25" size="60,22" font="Regular;20" transparent="1" >
                        <convert type="ClockToText">Default</convert>
                </widget>
                <widget source="Event_Now" render="Label" position="5,25" size="60,22" font="Regular;20" transparent="1" >

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 594aea4b127812ac44b1ab07260035832187c14d..9a8b493576dd7fdce1e6efeed205ee35e4980d40 100644 (file)
--- 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.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
 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["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()
                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 62949ed1c8d5cda42d049b650e14fcb78b74f519..c50d82bce975f141821c9a377136fbd23be19552 100644 (file)
--- 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.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
 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)
 
                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"],
                        {
 
                self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
                        {


@@ -1303,7 +1303,7 @@ class RadioInfoBar(Screen, InfoBarEvent, InfoBarServiceName):
                Screen.__init__(self, session)
                InfoBarEvent.__init__(self)
                InfoBarServiceName.__init__(self)
                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()
                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 eeb0f418118b483cf9e6fcc69071ff59f797ead4..27f75388e2405667a721407708a2078bdf740d98 100644 (file)
--- 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 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
 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.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=
                        {
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2ca2681facfdca0df0dde7803c662f6d80fa1b2d..dde271bc7b81dc0c134ea018364526432f8c002c 100644 (file)
--- 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.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
 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 1a5fe88752e3eac93c602789b8213a57837d8cfc..651d2e3d3887abda575cd4ab0d69e1327025d2e6 100644 (file)
--- a/lib/python/Screens/SimpleSummary.py
+++ b/lib/python/Screens/SimpleSummary.py
@@ -1,10 +1,10 @@
 from Screens.Screen import Screen
 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">
 
 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" />
                        <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)
        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):
                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 b572bd80e84c6620b8965ce27d5515d9c57d8fd6..43c95dbd1b48886a13c4563a586812338f206a8c 100644 (file)
--- 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.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
 
 
 inStandby = None
 


@@ -72,14 +72,14 @@ class Standby(Screen):
 class StandbySummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
 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)
                        <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
 
 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox