From: Andreas Monzner Date: Mon, 14 Apr 2008 11:31:34 +0000 (+0000) Subject: remove deprecated code (deprecation date was 2008-01 and 2008-02) X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=efc5aca651306518e6f21a6bd7cbfa1928821b60 remove deprecated code (deprecation date was 2008-01 and 2008-02) --- diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py index 4c52068..b636632 100644 --- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py +++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py @@ -7,7 +7,7 @@ from Components.ActionMap import HelpableActionMap from Components.MultiContent import MultiContentEntryText from Components.ServiceEventTracker import ServiceEventTracker from Components.VideoWindow import VideoWindow -from Screens.InfoBarGenerics import InfoBarSeek, InfoBarCueSheetSupport, InfoBarServiceName +from Screens.InfoBarGenerics import InfoBarSeek, InfoBarCueSheetSupport from Components.GUIComponent import GUIComponent from enigma import eListboxPythonMultiContent, eListbox, gFont, iPlayableService, RT_HALIGN_RIGHT from Screens.FixedMenu import FixedMenu @@ -144,7 +144,7 @@ class CutList(GUIComponent): if self.instance is not None: self.instance.moveSelectionTo(index) -class CutListEditor(Screen, InfoBarSeek, InfoBarCueSheetSupport, InfoBarServiceName, HelpableScreen): +class CutListEditor(Screen, InfoBarSeek, InfoBarCueSheetSupport, HelpableScreen): skin = """ @@ -170,7 +170,6 @@ class CutListEditor(Screen, InfoBarSeek, InfoBarCueSheetSupport, InfoBarServiceN Screen.__init__(self, session) InfoBarSeek.__init__(self, actionmap = "CutlistSeekActions") InfoBarCueSheetSupport.__init__(self) - InfoBarServiceName.__init__(self) HelpableScreen.__init__(self) self.old_service = session.nav.getCurrentlyPlayingServiceReference() session.nav.playService(service) diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py index e41ecaf..367b27f 100644 --- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py +++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py @@ -7,7 +7,6 @@ from Components.HTMLComponent import HTMLComponent from Components.GUIComponent import GUIComponent from Components.EpgList import Rect from Components.Sources.Event import Event -from Components.Sources.Source import ObsoleteSource from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest from Screens.Screen import Screen from Screens.EventView import EventViewSimple @@ -347,7 +346,6 @@ class GraphMultiEPG(Screen): self["key_green"] = Button(_("Add timer")) self["timeline_text"] = TimelineText() self["Event"] = Event() - 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 77991d0..755d37f 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -14,12 +14,10 @@ from Tools.NumericalTextInput import NumericalTextInput profile("ChannelSelection.py 2") from Components.NimManager import nimmanager profile("ChannelSelection.py 2.1") -from Components.Sources.Source import ObsoleteSource -profile("ChannelSelection.py 2.2") from Components.Sources.RdsDecoder import RdsDecoder -profile("ChannelSelection.py 2.3") +profile("ChannelSelection.py 2.2") from Components.Sources.ServiceEvent import ServiceEvent -profile("ChannelSelection.py 2.4") +profile("ChannelSelection.py 2.3") from Components.Input import Input profile("ChannelSelection.py 3") from Components.ParentalControl import parentalControl @@ -1067,8 +1065,6 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect ChannelSelectionEPG.__init__(self) SelectionEventInfo.__init__(self) - self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01") - self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"], { "cancel": self.cancel, @@ -1321,14 +1317,10 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect self.asciiOff() self.close(None) -from Screens.InfoBarGenerics import InfoBarEvent, InfoBarServiceName - -class RadioInfoBar(Screen, InfoBarEvent, InfoBarServiceName): +class RadioInfoBar(Screen): def __init__(self, session): Screen.__init__(self, session) InfoBarEvent.__init__(self) - InfoBarServiceName.__init__(self) - 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 a6f4fb1..ad38f46 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -15,15 +15,14 @@ from Screens.ChoiceBox import ChoiceBox profile("LOAD:InfoBarGenerics") from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ - InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ + InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \ InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ - InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \ + InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport profile("LOAD:InitBar_Components") -from Components.Sources.Source import ObsoleteSource from Components.ActionMap import HelpableActionMap from Components.config import config from Components.ServiceEventTracker import ServiceEventTracker @@ -33,9 +32,9 @@ from Screens.HelpMenu import HelpableScreen class InfoBar(InfoBarShowHide, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, - InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, + InfoBarInstantRecord, InfoBarAudioSelection, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, - InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek, + InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, Screen): @@ -55,9 +54,9 @@ class InfoBar(InfoBarShowHide, for x in HelpableScreen, \ InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \ - InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ + InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ - InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ + InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \ InfoBarPlugins, InfoBarServiceErrorPopupSupport: x.__init__(self) @@ -65,8 +64,6 @@ class InfoBar(InfoBarShowHide, self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))])) self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))])) - self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01") - self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged @@ -123,7 +120,7 @@ class InfoBar(InfoBarShowHide, class MoviePlayer(InfoBarShowHide, \ InfoBarMenu, \ - InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, + InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport): @@ -140,7 +137,7 @@ class MoviePlayer(InfoBarShowHide, \ }) for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ - InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ + InfoBarSeek, InfoBarShowMovies, \ InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 13c3ad3..eef0f56 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -9,7 +9,6 @@ from Components.Label import Label from Components.Pixmap import Pixmap from Components.PluginComponent import plugins from Components.ServiceEventTracker import ServiceEventTracker -from Components.Sources.Source import ObsoleteSource from Components.Sources.Boolean import Boolean from Components.config import config, ConfigBoolean, ConfigClock from Components.SystemInfo import SystemInfo @@ -539,17 +538,6 @@ class InfoBarEPG: self.epglist[1]=tmp setEvent(self.epglist[0]) -class InfoBarTuner: - """provides a snr/agc/ber display""" - def __init__(self): - 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"] = 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""" def __init__(self): @@ -598,10 +586,6 @@ class InfoBarRdsDecoder: self.RassSlidePicChanged() self.rds_display.show() -class InfoBarServiceName: - def __init__(self): - self["CurrentService"] = ObsoleteSource(new_source = "session.CurrentService", removal_date = "2008-01") - class InfoBarSeek: """handles actions like seeking, pause""" @@ -1390,13 +1374,6 @@ class InfoBarInstantRecord: "instantRecord": (self.instantRecord, _("Instant Record...")), }) self.recording = [] -#### 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): if entry is not None and entry != -1: @@ -1739,59 +1716,6 @@ class InfoBarAdditionalInfo: self["TimeshiftPossible"] = self["RecordingPossible"] self["ExtensionsAvailable"] = Boolean(fixed=1) -######### 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: - res_mgr.frontendUseMaskChanged.get().append(self.tunerUseMaskChanged) - - self.session.nav.event.append(self.gotServiceEvent) # we like to get service events - - def tunerUseMaskChanged(self, mask): - if mask&1: - self["NimA_Active"].show() - else: - self["NimA_Active"].hide() - if mask&2: - self["NimB_Active"].show() - else: - self["NimB_Active"].hide() - - def checkTunerState(self, service): - info = service and service.frontendInfo() - feNumber = info and info.getFrontendInfo(iFrontendInformation.frontendNumber) - if feNumber is None: - self["NimA"].hide() - self["NimB"].hide() - elif feNumber == 0: - self["NimB"].hide() - self["NimA"].show() - elif feNumber == 1: - self["NimA"].hide() - self["NimB"].show() - - def gotServiceEvent(self, ev): - service = self.session.nav.getCurrentService() - if ev == iPlayableService.evUpdatedInfo or ev == iPlayableService.evEnd: - self.checkTunerState(service) -#################################### - class InfoBarNotifications: def __init__(self): self.onExecBegin.append(self.checkNotifications) diff --git a/lib/python/Screens/SimpleSummary.py b/lib/python/Screens/SimpleSummary.py index 5f76f16..4187564 100644 --- a/lib/python/Screens/SimpleSummary.py +++ b/lib/python/Screens/SimpleSummary.py @@ -1,5 +1,5 @@ from Screens.Screen import Screen -from Components.Sources.Source import ObsoleteSource +#from Components.Sources.Source import ObsoleteSource class SimpleSummary(Screen): skin = """ @@ -23,7 +23,6 @@ class SimpleSummary(Screen): # if parent has a "skin_summary" defined, use that as default self.skin = parent.__dict__.get("skin_summary", self.skin) - self["Clock"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01") self["Title"] = Label(parent.title or "") def setTitle(self, title): diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index b8af16f..4cda9d1 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -3,7 +3,6 @@ from Components.ActionMap import ActionMap from Components.config import config from Components.AVSwitch import AVSwitch from enigma import eDVBVolumecontrol -from Components.Sources.Source import ObsoleteSource inStandby = None @@ -83,7 +82,6 @@ class StandbySummary(Screen): def __init__(self, session, parent): Screen.__init__(self, session) - self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01") from enigma import quitMainloop, iRecordableService from Screens.MessageBox import MessageBox diff --git a/lib/python/Screens/SubservicesQuickzap.py b/lib/python/Screens/SubservicesQuickzap.py index 448b4b4..67e27e2 100644 --- a/lib/python/Screens/SubservicesQuickzap.py +++ b/lib/python/Screens/SubservicesQuickzap.py @@ -4,14 +4,14 @@ from Components.Label import Label from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox -from InfoBarGenerics import InfoBarShowHide, InfoBarMenu, InfoBarServiceName, InfoBarInstantRecord, InfoBarTimeshift, InfoBarSeek, InfoBarTimeshiftState, InfoBarExtensions, InfoBarSubtitleSupport, InfoBarAudioSelection +from InfoBarGenerics import InfoBarShowHide, InfoBarMenu, InfoBarInstantRecord, InfoBarTimeshift, InfoBarSeek, InfoBarTimeshiftState, InfoBarExtensions, InfoBarSubtitleSupport, InfoBarAudioSelection from enigma import eTimer -class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarServiceName, InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, InfoBarTimeshiftState, InfoBarExtensions, InfoBarSubtitleSupport, InfoBarAudioSelection, Screen): +class SubservicesQuickzap(InfoBarShowHide, InfoBarMenu, InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, InfoBarTimeshiftState, InfoBarExtensions, InfoBarSubtitleSupport, InfoBarAudioSelection, Screen): def __init__(self, session, subservices): Screen.__init__(self, session) - for x in [InfoBarShowHide, InfoBarMenu, InfoBarServiceName, InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, InfoBarTimeshiftState, InfoBarSubtitleSupport, InfoBarExtensions, InfoBarAudioSelection]: + for x in [InfoBarShowHide, InfoBarMenu, InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, InfoBarTimeshiftState, InfoBarSubtitleSupport, InfoBarExtensions, InfoBarAudioSelection]: x.__init__(self) self.restoreService = self.session.nav.getCurrentlyPlayingServiceReference()