From: Felix Domke Date: Sun, 30 Sep 2007 15:05:39 +0000 (+0000) Subject: replace some more Clock() by ObsoleteSource redirect (and fix skin_default), by Morit... X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=7cdca2a2cfb44ad34a3b36fb589f02b861c411c3 replace some more Clock() by ObsoleteSource redirect (and fix skin_default), by Moritz Venn --- diff --git a/data/skin_default.xml b/data/skin_default.xml index 135a454..06aa859 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -47,7 +47,7 @@ Name - + @@ -216,7 +216,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + WithSeconds @@ -503,7 +503,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) Progress - + Default diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py index 594aea4..9a8b493 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 62949ed..c50d82b 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 eeb0f41..27f7538 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 2ca2681..dde271b 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 1a5fe88..651d2e3 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 = """ - + WithSeconds @@ -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 b572bd8..43c95db 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 = """ - + """ 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