From 522d72afdfbf2484b58bbe298124f7dfdb39d895 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Thu, 26 Nov 2015 23:24:50 +0100 Subject: [PATCH] replaced deprecated ConfigEnableDisable by ConfigOnOff --- aspectratioswitch/src/plugin.py | 6 ++--- autotimer/src/AutoTimerEditor.py | 16 ++++++------ autotimer/src/__init__.py | 12 ++++----- babelzapper/src/plugin.py | 6 ++--- elektro/src/plugin.py | 2 +- emailclient/src/EmailConfig.py | 4 +-- emailclient/src/plugin.py | 8 +++--- fritzcall/src/plugin.py | 42 ++++++++++++++++---------------- infobartunerstate/src/plugin.py | 2 +- ncidclient/src/plugin.py | 20 +++++++-------- networkbrowser/src/MountEdit.py | 4 +-- pipzap/src/plugin.py | 10 ++++---- pushservice/src/plugin.py | 8 +++--- seriesplugin/src/plugin.py | 4 +-- simplerss/src/RSSSetup.py | 6 ++--- simplerss/src/plugin.py | 8 +++--- startuptostandby/src/plugin.py | 4 +-- teletext/src/plugin.py | 12 ++++----- webinterface/src/plugin.py | 6 ++--- 19 files changed, 90 insertions(+), 90 deletions(-) diff --git a/aspectratioswitch/src/plugin.py b/aspectratioswitch/src/plugin.py index 2c257d3d..bd5ae975 100644 --- a/aspectratioswitch/src/plugin.py +++ b/aspectratioswitch/src/plugin.py @@ -17,7 +17,7 @@ from Screens.MessageBox import MessageBox from Tools import Notifications # Configuration -from Components.config import config, getConfigListEntry, ConfigSubsection, ConfigSubDict, ConfigEnableDisable, ConfigYesNo, ConfigSelection +from Components.config import config, getConfigListEntry, ConfigSubsection, ConfigSubDict, ConfigOnOff, ConfigYesNo, ConfigSelection from Components.Sources.StaticText import StaticText from Components.Label import Label @@ -74,9 +74,9 @@ PACKAGE_PATH = os.path.dirname(str((globals())["__file__"])) KEYMAPPINGS = {'bouquet': os.path.join(PACKAGE_PATH, 'keymap-bouquet.xml'), 'help': os.path.join(PACKAGE_PATH, 'keymap-help.xml'), 'radio': os.path.join(PACKAGE_PATH, 'keymap-radio.xml'), 'video': os.path.join(PACKAGE_PATH, 'keymap-video.xml')} config.plugins.AspectRatioSwitch = ConfigSubsection() -config.plugins.AspectRatioSwitch.enabled = ConfigEnableDisable(default = False) +config.plugins.AspectRatioSwitch.enabled = ConfigOnOff(default = False) config.plugins.AspectRatioSwitch.keymap = ConfigSelection({'bouquet': _('Bouquet +/- long'), 'help': _('Help key long'), 'radio': _('Radio key long'), 'video': _('PVR key long')}, default='bouquet') -config.plugins.AspectRatioSwitch.autostart_ratio_enabled = ConfigEnableDisable(default = False) +config.plugins.AspectRatioSwitch.autostart_ratio_enabled = ConfigOnOff(default = False) config.plugins.AspectRatioSwitch.autostart_ratio = ConfigSelection(choices = [("0", _("4:3 Letterbox")), ("1", _("4:3 PanScan")), ("2", _("16:9")), ("3", _("16:9 always")), ("4", _("16:10 Letterbox")), ("5", _("16:10 PanScan")), ("6", _("16:9 Letterbox"))], default = "6") config.plugins.AspectRatioSwitch.showmsg = ConfigYesNo(default = True) config.plugins.AspectRatioSwitch.modes = ConfigSubDict() diff --git a/autotimer/src/AutoTimerEditor.py b/autotimer/src/AutoTimerEditor.py index b646fa2d..79d33bf4 100644 --- a/autotimer/src/AutoTimerEditor.py +++ b/autotimer/src/AutoTimerEditor.py @@ -18,7 +18,7 @@ from Components.ActionMap import ActionMap from Components.Sources.StaticText import StaticText # Configuration -from Components.config import getConfigListEntry, ConfigEnableDisable, \ +from Components.config import getConfigListEntry, ConfigOnOff, \ ConfigYesNo, ConfigText, ConfigClock, ConfigNumber, ConfigSelection, \ ConfigDateTime, config, NoSave @@ -216,7 +216,7 @@ class AutoTimerEditorBase: now[3] = 23 now[4] = 15 end = mktime(now) - self.timespan = NoSave(ConfigEnableDisable(default = default)) + self.timespan = NoSave(ConfigOnOff(default = default)) self.timespanbegin = NoSave(ConfigClock(default = begin)) self.timespanend = NoSave(ConfigClock(default = end)) @@ -232,7 +232,7 @@ class AutoTimerEditorBase: now[4] = 0 begin = mktime(now) end = begin + 604800 # today + 7d - self.timeframe = NoSave(ConfigEnableDisable(default = default)) + self.timeframe = NoSave(ConfigOnOff(default = default)) self.timeframebegin = NoSave(ConfigDateTime(begin, _("%d.%B %Y"), increment = 86400)) self.timeframeend = NoSave(ConfigDateTime(end, _("%d.%B %Y"), increment = 86400)) @@ -247,7 +247,7 @@ class AutoTimerEditorBase: default = False begin = 5 end = 5 - self.offset = NoSave(ConfigEnableDisable(default = default)) + self.offset = NoSave(ConfigOnOff(default = default)) self.offsetbegin = NoSave(ConfigNumber(default = begin)) self.offsetend = NoSave(ConfigNumber(default = end)) @@ -285,7 +285,7 @@ class AutoTimerEditorBase: now[3] = 7 now[4] = 0 end = mktime(now) - self.afterevent_timespan = NoSave(ConfigEnableDisable(default = default)) + self.afterevent_timespan = NoSave(ConfigOnOff(default = default)) self.afterevent_timespanbegin = NoSave(ConfigClock(default = begin)) self.afterevent_timespanend = NoSave(ConfigClock(default = end)) @@ -299,7 +299,7 @@ class AutoTimerEditorBase: else: default = False duration =70 - self.duration = NoSave(ConfigEnableDisable(default = default)) + self.duration = NoSave(ConfigOnOff(default = default)) self.durationlength = NoSave(ConfigNumber(default = duration)) # Counter @@ -888,7 +888,7 @@ class AutoTimerFilterEditor(Screen, ConfigListScreen): )) self.typeSelection.addNotifier(self.refresh, initial_call = False) - self.enabled = NoSave(ConfigEnableDisable(default = filterset)) + self.enabled = NoSave(ConfigOnOff(default = filterset)) self.excludes = excludes self.includes = includes @@ -1089,7 +1089,7 @@ class AutoTimerServiceEditor(Screen, ConfigListScreen): bouquetlist[:] ) - self.enabled = NoSave(ConfigEnableDisable(default = servicerestriction)) + self.enabled = NoSave(ConfigOnOff(default = servicerestriction)) self.typeSelection = NoSave(ConfigSelection(choices = [ ("channels", _("Channels")), ("bouquets", _("Bouquets"))] diff --git a/autotimer/src/__init__.py b/autotimer/src/__init__.py index 08dc44d1..261a4b70 100644 --- a/autotimer/src/__init__.py +++ b/autotimer/src/__init__.py @@ -5,11 +5,11 @@ from os import environ as os_environ import gettext # Config -from Components.config import config, ConfigSubsection, ConfigEnableDisable, \ +from Components.config import config, ConfigSubsection, ConfigOnOff, \ ConfigNumber, ConfigSelection, ConfigYesNo config.plugins.autotimer = ConfigSubsection() -config.plugins.autotimer.autopoll = ConfigEnableDisable(default=False) +config.plugins.autotimer.autopoll = ConfigOnOff(default=False) config.plugins.autotimer.delay = ConfigNumber(default=3) config.plugins.autotimer.editdelay = ConfigNumber(default=3) config.plugins.autotimer.interval = ConfigNumber(default=3) @@ -20,16 +20,16 @@ config.plugins.autotimer.refresh = ConfigSelection(choices=[ ("all", _("All non-repeating timers")) ], default="none" ) -config.plugins.autotimer.try_guessing = ConfigEnableDisable(default=True) +config.plugins.autotimer.try_guessing = ConfigOnOff(default=True) config.plugins.autotimer.editor = ConfigSelection(choices=[ ("plain", _("Classic")), ("wizard", _("Wizard")) ], default="wizard" ) -config.plugins.autotimer.addsimilar_on_conflict = ConfigEnableDisable(default=False) +config.plugins.autotimer.addsimilar_on_conflict = ConfigOnOff(default=False) config.plugins.autotimer.add_autotimer_to_tags = ConfigYesNo(default=False) config.plugins.autotimer.add_name_to_tags = ConfigYesNo(default=False) -config.plugins.autotimer.disabled_on_conflict = ConfigEnableDisable(default=False) +config.plugins.autotimer.disabled_on_conflict = ConfigOnOff(default=False) config.plugins.autotimer.show_in_extensionsmenu = ConfigYesNo(default=False) config.plugins.autotimer.fastscan = ConfigYesNo(default=False) config.plugins.autotimer.notifconflict = ConfigYesNo(default=True) @@ -39,7 +39,7 @@ config.plugins.autotimer.show_help = ConfigYesNo(default=True) config.plugins.autotimer.skip_during_records = ConfigYesNo(default=False) config.plugins.autotimer.skip_during_epgrefresh = ConfigYesNo(default=False) config.plugins.autotimer.popup_timeout = ConfigNumber(default=5) -config.plugins.autotimer.check_eit_and_remove = ConfigEnableDisable(default=False) +config.plugins.autotimer.check_eit_and_remove = ConfigOnOff(default=False) def localeInit(): lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country" diff --git a/babelzapper/src/plugin.py b/babelzapper/src/plugin.py index 18cad8c8..a55f3344 100644 --- a/babelzapper/src/plugin.py +++ b/babelzapper/src/plugin.py @@ -14,7 +14,7 @@ from Screens.Screen import Screen from Screens.Setup import SetupSummary from Screens.Console import Console from Screens.MessageBox import MessageBox -from Components.config import config, ConfigSubsection, ConfigEnableDisable, ConfigInteger, getConfigListEntry +from Components.config import config, ConfigSubsection, ConfigOnOff, ConfigInteger, getConfigListEntry from Components.ConfigList import ConfigListScreen from Components.ActionMap import ActionMap from Components.Label import Label, MultiColorLabel @@ -35,9 +35,9 @@ babeldone=0 babelon=0 config.plugins.babelzapper = ConfigSubsection() -config.plugins.babelzapper.enabled = ConfigEnableDisable(default = False) +config.plugins.babelzapper.enabled = ConfigOnOff(default = False) config.plugins.babelzapper.changetime = ConfigInteger(default = 1000, limits = (200, 10000)) -config.plugins.babelzapper.exit2escape = ConfigEnableDisable(default = False) +config.plugins.babelzapper.exit2escape = ConfigOnOff(default = False) def main(session,**kwargs): session.open(BabelzapperConfiguration) diff --git a/elektro/src/plugin.py b/elektro/src/plugin.py index 9566aef5..1656fc39 100644 --- a/elektro/src/plugin.py +++ b/elektro/src/plugin.py @@ -42,7 +42,7 @@ from Components.Harddisk import harddiskmanager from Components.Sources.StaticText import StaticText # Configuration -from Components.config import configfile, getConfigListEntry, ConfigEnableDisable, \ +from Components.config import configfile, getConfigListEntry, ConfigOnOff, \ ConfigYesNo, ConfigText, ConfigClock, ConfigNumber, ConfigSelection, \ config, ConfigSubsection, ConfigSubList, ConfigSubDict, ConfigIP, ConfigInteger diff --git a/emailclient/src/EmailConfig.py b/emailclient/src/EmailConfig.py index 5d9ab393..aed69ec6 100644 --- a/emailclient/src/EmailConfig.py +++ b/emailclient/src/EmailConfig.py @@ -3,7 +3,7 @@ Configuration screens for EmailClient ''' from Screens.Screen import Screen from Screens.MessageBox import MessageBox -from Components.config import config, getConfigListEntry, ConfigText, ConfigPassword, ConfigSelection, ConfigEnableDisable +from Components.config import config, getConfigListEntry, ConfigText, ConfigPassword, ConfigSelection, ConfigOnOff from Components.ConfigList import ConfigListScreen from Components.Label import Label from Components.ActionMap import ActionMap @@ -123,7 +123,7 @@ class EmailConfigAccount(ConfigListScreen, Screen): self._cInterval.setUseableChars('0123456789,') self._cMaxmail = ConfigText(self._maxmail, fixed_size=False) self._cMaxmail.setUseableChars('0123456789,') - self._cListall = ConfigEnableDisable(self._listall) + self._cListall = ConfigOnOff(self._listall) self.list = [ getConfigListEntry(_("account name"), self._cName), diff --git a/emailclient/src/plugin.py b/emailclient/src/plugin.py index 677024de..fef37584 100644 --- a/emailclient/src/plugin.py +++ b/emailclient/src/plugin.py @@ -12,7 +12,7 @@ from Components.MenuList import MenuList from Components.MultiContent import MultiContentEntryText from Components.ScrollLabel import ScrollLabel from Components.Button import Button -from Components.config import config, ConfigSubsection, ConfigInteger, ConfigEnableDisable +from Components.config import config, ConfigSubsection, ConfigInteger, ConfigOnOff from Plugins.Plugin import PluginDescriptor from Screens.ChoiceBox import ChoiceBox from Screens.Screen import Screen @@ -31,10 +31,10 @@ mailAccounts = [] # contains all EmailAccount objects from EmailConfig import EmailConfigOptions, EmailConfigAccount config.plugins.emailimap = ConfigSubsection() -config.plugins.emailimap.showDeleted = ConfigEnableDisable(default=False) +config.plugins.emailimap.showDeleted = ConfigOnOff(default=False) config.plugins.emailimap.timeout = ConfigInteger(default=0, limits=(0, 90)) # in seconds -config.plugins.emailimap.verbose = ConfigEnableDisable(default=True) -config.plugins.emailimap.debug = ConfigEnableDisable(default=False) +config.plugins.emailimap.verbose = ConfigOnOff(default=True) +config.plugins.emailimap.debug = ConfigOnOff(default=False) def decodeHeader(text, default=''): if text is None: diff --git a/fritzcall/src/plugin.py b/fritzcall/src/plugin.py index 7cfe948a..76feba85 100644 --- a/fritzcall/src/plugin.py +++ b/fritzcall/src/plugin.py @@ -36,7 +36,7 @@ from Components.Label import Label from Components.Button import Button from Components.Pixmap import Pixmap from Components.Sources.List import List -from Components.config import config, ConfigSubsection, ConfigSelection, ConfigDirectory, ConfigEnableDisable, getConfigListEntry, ConfigText, ConfigInteger +from Components.config import config, ConfigSubsection, ConfigSelection, ConfigDirectory, ConfigOnOff, getConfigListEntry, ConfigText, ConfigInteger from Components.ConfigList import ConfigListScreen try: from Components.config import ConfigPassword @@ -101,43 +101,43 @@ initDebug() config.plugins.FritzCall = ConfigSubsection() config.plugins.FritzCall.fwVersion = ConfigSelection(choices=[(None, _("not configured")), ("old", _("before 05.27")), ("05.27", "05.27, 05.28"), ("05.50", _("05.29 until below 6.35")), ("06.35", _("06.35 and newer"))], default=None) #config.plugins.FritzCall.fwVersion = ConfigSelection(choices=[(None, _("not configured")), ("old", _("before 05.27")), ("05.27", "05.27, 05.28"), ("05.50", _("05.29 and newer"))], default=None) -config.plugins.FritzCall.debug = ConfigEnableDisable(default=False) +config.plugins.FritzCall.debug = ConfigOnOff(default=False) #config.plugins.FritzCall.muteOnCall = ConfigSelection(choices=[(None, _("no")), ("ring", _("on ring")), ("connect", _("on connect"))]) #config.plugins.FritzCall.muteOnCall = ConfigSelection(choices=[(None, _("no")), ("ring", _("on ring"))]) -config.plugins.FritzCall.muteOnCall = ConfigEnableDisable(default=False) +config.plugins.FritzCall.muteOnCall = ConfigOnOff(default=False) config.plugins.FritzCall.hostname = ConfigText(default="fritz.box", fixed_size=False) config.plugins.FritzCall.afterStandby = ConfigSelection(choices=[("none", _("show nothing")), ("inList", _("show as list")), ("each", _("show each call"))]) -config.plugins.FritzCall.filter = ConfigEnableDisable(default=False) +config.plugins.FritzCall.filter = ConfigOnOff(default=False) config.plugins.FritzCall.filtermsn = ConfigText(default="", fixed_size=False) config.plugins.FritzCall.filtermsn.setUseableChars('0123456789,') -config.plugins.FritzCall.filterCallList = ConfigEnableDisable(default=True) -config.plugins.FritzCall.showBlacklistedCalls = ConfigEnableDisable(default=False) -config.plugins.FritzCall.showOutgoingCalls = ConfigEnableDisable(default=False) +config.plugins.FritzCall.filterCallList = ConfigOnOff(default=True) +config.plugins.FritzCall.showBlacklistedCalls = ConfigOnOff(default=False) +config.plugins.FritzCall.showOutgoingCalls = ConfigOnOff(default=False) config.plugins.FritzCall.timeout = ConfigInteger(default=15, limits=(0, 60)) -config.plugins.FritzCall.lookup = ConfigEnableDisable(default=False) -config.plugins.FritzCall.internal = ConfigEnableDisable(default=False) -config.plugins.FritzCall.fritzphonebook = ConfigEnableDisable(default=False) +config.plugins.FritzCall.lookup = ConfigOnOff(default=False) +config.plugins.FritzCall.internal = ConfigOnOff(default=False) +config.plugins.FritzCall.fritzphonebook = ConfigOnOff(default=False) config.plugins.FritzCall.fritzphonebookName = ConfigText(default='Dreambox', fixed_size=False) -config.plugins.FritzCall.phonebook = ConfigEnableDisable(default=False) -config.plugins.FritzCall.addcallers = ConfigEnableDisable(default=False) -config.plugins.FritzCall.enable = ConfigEnableDisable(default=False) +config.plugins.FritzCall.phonebook = ConfigOnOff(default=False) +config.plugins.FritzCall.addcallers = ConfigOnOff(default=False) +config.plugins.FritzCall.enable = ConfigOnOff(default=False) config.plugins.FritzCall.username = ConfigText(default='BoxAdmin', fixed_size=False) config.plugins.FritzCall.password = ConfigPassword(default="", fixed_size=False) config.plugins.FritzCall.extension = ConfigText(default='1', fixed_size=False) config.plugins.FritzCall.extension.setUseableChars('0123456789') -config.plugins.FritzCall.showType = ConfigEnableDisable(default=True) -config.plugins.FritzCall.showShortcut = ConfigEnableDisable(default=False) -config.plugins.FritzCall.showVanity = ConfigEnableDisable(default=False) +config.plugins.FritzCall.showType = ConfigOnOff(default=True) +config.plugins.FritzCall.showShortcut = ConfigOnOff(default=False) +config.plugins.FritzCall.showVanity = ConfigOnOff(default=False) config.plugins.FritzCall.prefix = ConfigText(default="", fixed_size=False) config.plugins.FritzCall.prefix.setUseableChars('0123456789') -config.plugins.FritzCall.connectionVerbose = ConfigEnableDisable(default=True) -config.plugins.FritzCall.ignoreUnknown = ConfigEnableDisable(default=False) +config.plugins.FritzCall.connectionVerbose = ConfigOnOff(default=True) +config.plugins.FritzCall.ignoreUnknown = ConfigOnOff(default=False) config.plugins.FritzCall.reloadPhonebookTime = ConfigInteger(default=8, limits=(0, 99)) -config.plugins.FritzCall.FritzExtendedSearchFaces = ConfigEnableDisable(default=False) -config.plugins.FritzCall.FritzExtendedSearchNames = ConfigEnableDisable(default=False) +config.plugins.FritzCall.FritzExtendedSearchFaces = ConfigOnOff(default=False) +config.plugins.FritzCall.FritzExtendedSearchNames = ConfigOnOff(default=False) config.plugins.FritzCall.phonebookLocation = ConfigDirectory(default = resolveFilename(SCOPE_CONFIG)) config.plugins.FritzCall.guestSSID = ConfigText(default="FRITZ!Box Gastzugang", fixed_size=False) -config.plugins.FritzCall.guestSecure = ConfigEnableDisable(default=True) +config.plugins.FritzCall.guestSecure = ConfigOnOff(default=True) config.plugins.FritzCall.guestPassword = ConfigText(default="guestguest!!!", fixed_size=False) guestWLANUptime = [(None, _('Not deactivating after time')), "15", "30", "45", "60", "90", "120", "180", "240", "300", "360", "480", "600", "720", "900", "1080", "1260"] diff --git a/infobartunerstate/src/plugin.py b/infobartunerstate/src/plugin.py index b371f1f0..e7c7d97f 100644 --- a/infobartunerstate/src/plugin.py +++ b/infobartunerstate/src/plugin.py @@ -111,7 +111,7 @@ event_choices = [ config.infobartunerstate = ConfigSubsection() config.infobartunerstate.about = ConfigNothing() -config.infobartunerstate.enabled = ConfigEnableDisable(default = True) +config.infobartunerstate.enabled = ConfigOnOff(default = True) config.infobartunerstate.extensions_menu_show = ConfigYesNo(default = True) config.infobartunerstate.extensions_menu_setup = ConfigYesNo(default = False) #config.infobartunerstate.popup_time = ConfigSelectionNumber(0, 10, 1, default = 5) diff --git a/ncidclient/src/plugin.py b/ncidclient/src/plugin.py index 0b500f63..2f4b1997 100644 --- a/ncidclient/src/plugin.py +++ b/ncidclient/src/plugin.py @@ -11,7 +11,7 @@ from Screens.InputBox import InputBox from Screens import Standby from Screens.HelpMenu import HelpableScreen -from Components.config import config, ConfigSubsection, ConfigSelection, ConfigEnableDisable, getConfigListEntry, ConfigText, ConfigInteger +from Components.config import config, ConfigSubsection, ConfigSelection, ConfigOnOff, getConfigListEntry, ConfigText, ConfigInteger from Components.ActionMap import ActionMap from Components.Label import Label from Components.Button import Button @@ -102,24 +102,24 @@ def getMountedDevices(): return mountedDevs config.plugins.NcidClient = ConfigSubsection() -config.plugins.NcidClient.debug = ConfigEnableDisable(default=False) -config.plugins.NcidClient.muteOnCall = ConfigEnableDisable(default=False) +config.plugins.NcidClient.debug = ConfigOnOff(default=False) +config.plugins.NcidClient.muteOnCall = ConfigOnOff(default=False) config.plugins.NcidClient.hostname = ConfigText(default="easy.box", fixed_size=False) config.plugins.NcidClient.port = ConfigInteger(limits=[1, 65535], default=3333) config.plugins.NcidClient.afterStandby = ConfigSelection(choices=[("none", _("show nothing")), ("inList", _("show as list")), ("each", _("show each call"))]) config.plugins.NcidClient.timeout = ConfigInteger(default=15, limits=(0, 60)) -config.plugins.NcidClient.lookup = ConfigEnableDisable(default=False) -config.plugins.NcidClient.internal = ConfigEnableDisable(default=False) +config.plugins.NcidClient.lookup = ConfigOnOff(default=False) +config.plugins.NcidClient.internal = ConfigOnOff(default=False) -config.plugins.NcidClient.addcallers = ConfigEnableDisable(default=False) -config.plugins.NcidClient.enable = ConfigEnableDisable(default=True) +config.plugins.NcidClient.addcallers = ConfigOnOff(default=False) +config.plugins.NcidClient.enable = ConfigOnOff(default=True) config.plugins.NcidClient.extension = ConfigText(default='1', fixed_size=False) config.plugins.NcidClient.extension.setUseableChars('0123456789') -config.plugins.NcidClient.showType = ConfigEnableDisable(default=True) +config.plugins.NcidClient.showType = ConfigOnOff(default=True) config.plugins.NcidClient.prefix = ConfigText(default="", fixed_size=False) config.plugins.NcidClient.prefix.setUseableChars('0123456789') -config.plugins.NcidClient.connectionVerbose = ConfigEnableDisable(default=True) -config.plugins.NcidClient.phonebook = ConfigEnableDisable(default=False) +config.plugins.NcidClient.connectionVerbose = ConfigOnOff(default=True) +config.plugins.NcidClient.phonebook = ConfigOnOff(default=False) config.plugins.NcidClient.phonebookLocation = ConfigSelection(choices=getMountedDevices()) config.plugins.NcidClient.country = ConfigSelection(choices=COUNTRY_CODES) config.plugins.NcidClient.name = ConfigText(default="", fixed_size=False) diff --git a/networkbrowser/src/MountEdit.py b/networkbrowser/src/MountEdit.py index 0ccb12e8..1b8a2352 100644 --- a/networkbrowser/src/MountEdit.py +++ b/networkbrowser/src/MountEdit.py @@ -6,7 +6,7 @@ from Screens.MessageBox import MessageBox from Screens.VirtualKeyBoard import VirtualKeyBoard from Components.ActionMap import ActionMap from Components.Sources.StaticText import StaticText -from Components.config import config, ConfigIP, NoSave, ConfigText, ConfigEnableDisable, ConfigPassword, ConfigSelection, getConfigListEntry, ConfigYesNo +from Components.config import config, ConfigIP, NoSave, ConfigText, ConfigOnOff, ConfigPassword, ConfigSelection, getConfigListEntry, ConfigYesNo from Components.ConfigList import ConfigListScreen from Components.Pixmap import Pixmap from Components.ActionMap import ActionMap, NumberActionMap @@ -100,7 +100,7 @@ class AutoMountEdit(Screen, ConfigListScreen): else: defaultOptions = iAutoMount.DEFAULT_OPTIONS_CIFS['options'] - self._cfgActive = NoSave(ConfigEnableDisable(default = active)) + self._cfgActive = NoSave(ConfigOnOff(default = active)) self._cfgIp = NoSave(ConfigIP(default = ip)) self._cfgSharename = NoSave(ConfigText(default = sharename, visible_width = 50, fixed_size = False)) self._cfgSharedir = NoSave(ConfigText(default = sharedir, visible_width = 50, fixed_size = False)) diff --git a/pipzap/src/plugin.py b/pipzap/src/plugin.py index df284e24..aab98fdb 100644 --- a/pipzap/src/plugin.py +++ b/pipzap/src/plugin.py @@ -5,7 +5,7 @@ from Plugins.Plugin import PluginDescriptor from Components.ActionMap import HelpableActionMap from Components.ChoiceList import ChoiceEntryComponent -from Components.config import config, ConfigSubsection, ConfigEnableDisable +from Components.config import config, ConfigSubsection, ConfigOnOff from Components.SystemInfo import SystemInfo from Components.ParentalControl import parentalControl from enigma import ePoint, eServiceReference, getDesktop @@ -511,10 +511,10 @@ def overwriteFunctions(): PictureInPicture.move = PictureInPicture_move config.plugins.pipzap = ConfigSubsection() -config.plugins.pipzap.enable_hotkey = ConfigEnableDisable(default = True) -config.plugins.pipzap.show_in_plugins = ConfigEnableDisable(default = False) -config.plugins.pipzap.show_label = ConfigEnableDisable(default = True) -config.plugins.pipzap.show_help = ConfigEnableDisable(default = True) +config.plugins.pipzap.enable_hotkey = ConfigOnOff(default = True) +config.plugins.pipzap.show_in_plugins = ConfigOnOff(default = False) +config.plugins.pipzap.show_label = ConfigOnOff(default = True) +config.plugins.pipzap.show_help = ConfigOnOff(default = True) def autostart(reason, **kwargs): if reason == 0: diff --git a/pushservice/src/plugin.py b/pushservice/src/plugin.py index 3b3c44bb..19e26249 100644 --- a/pushservice/src/plugin.py +++ b/pushservice/src/plugin.py @@ -22,7 +22,7 @@ import os, sys, traceback from Plugins.Plugin import PluginDescriptor # Config -from Components.config import config, ConfigSubsection, ConfigNothing, ConfigEnableDisable, ConfigText, ConfigClock, ConfigSelectionNumber +from Components.config import config, ConfigSubsection, ConfigNothing, ConfigOnOff, ConfigText, ConfigClock, ConfigSelectionNumber # Default encoding #from Components.Language import language @@ -56,17 +56,17 @@ config.pushservice = ConfigSubsection() config.pushservice.about = ConfigNothing() -config.pushservice.enable = ConfigEnableDisable(default = True) +config.pushservice.enable = ConfigOnOff(default = True) config.pushservice.boxname = ConfigText(default = "Enigma2", fixed_size = False) config.pushservice.xmlpath = ConfigText(default = "/etc/enigma2/pushservice.xml", fixed_size = False) config.pushservice.time = ConfigClock(default = 0) config.pushservice.period = ConfigSelectionNumber(0, 1000, 1, default = 24) -config.pushservice.runonboot = ConfigEnableDisable(default = True) +config.pushservice.runonboot = ConfigOnOff(default = True) config.pushservice.bootdelay = ConfigSelectionNumber(5, 1000, 5, default = 10) -config.pushservice.push_errors = ConfigEnableDisable(default = False) +config.pushservice.push_errors = ConfigOnOff(default = False) ####################################################### diff --git a/seriesplugin/src/plugin.py b/seriesplugin/src/plugin.py index 5c5b7743..7a355d9c 100644 --- a/seriesplugin/src/plugin.py +++ b/seriesplugin/src/plugin.py @@ -11,7 +11,7 @@ from Screens.MessageBox import MessageBox from Tools.Notifications import AddPopup # Config -from Components.config import config, ConfigSubsection, ConfigEnableDisable, ConfigNumber, ConfigSelection, ConfigYesNo, ConfigText, ConfigSelectionNumber +from Components.config import config, ConfigSubsection, ConfigOnOff, ConfigNumber, ConfigSelection, ConfigYesNo, ConfigText, ConfigSelectionNumber # Plugin from Components.PluginComponent import plugins @@ -75,7 +75,7 @@ def buildURL(url): # Initialize Configuration config.plugins.seriesplugin = ConfigSubsection() -config.plugins.seriesplugin.enabled = ConfigEnableDisable(default = False) +config.plugins.seriesplugin.enabled = ConfigOnOff(default = False) config.plugins.seriesplugin.menu_info = ConfigYesNo(default = True) config.plugins.seriesplugin.menu_extensions = ConfigYesNo(default = False) diff --git a/simplerss/src/RSSSetup.py b/simplerss/src/RSSSetup.py index 88284e36..fb7b2aee 100644 --- a/simplerss/src/RSSSetup.py +++ b/simplerss/src/RSSSetup.py @@ -2,7 +2,7 @@ from . import _ from Screens.Screen import Screen -from Components.config import config, ConfigSubsection, ConfigEnableDisable, \ +from Components.config import config, ConfigSubsection, ConfigOnOff, \ ConfigText, getConfigListEntry from Components.ConfigList import ConfigListScreen from Components.Sources.StaticText import StaticText @@ -167,7 +167,7 @@ class RSSSetup(ConfigListScreen, Screen): l = config.plugins.simpleRSS.feed s = ConfigSubsection() s.uri = ConfigText(default="http://", fixed_size = False) - s.autoupdate = ConfigEnableDisable(default=True) + s.autoupdate = ConfigOnOff(default=True) id = len(l) l.append(s) @@ -211,7 +211,7 @@ def addFeed(address, auto = False): # Create new Item s = ConfigSubsection() s.uri = ConfigText(default="http://", fixed_size = False) - s.autoupdate = ConfigEnableDisable(default=True) + s.autoupdate = ConfigOnOff(default=True) # Set values s.uri.value = address diff --git a/simplerss/src/plugin.py b/simplerss/src/plugin.py index d9fc75d6..9bb5c186 100644 --- a/simplerss/src/plugin.py +++ b/simplerss/src/plugin.py @@ -2,7 +2,7 @@ from . import _ from Components.config import config, ConfigSubsection, ConfigSubList, \ - ConfigEnableDisable, ConfigNumber, ConfigText, ConfigSelection, \ + ConfigOnOff, ConfigNumber, ConfigText, ConfigSelection, \ ConfigYesNo, ConfigPassword from Components.PluginComponent import plugins @@ -21,14 +21,14 @@ simpleRSS.update_notification = ConfigSelection( ) simpleRSS.interval = ConfigNumber(default=15) simpleRSS.feedcount = ConfigNumber(default=0) -simpleRSS.autostart = ConfigEnableDisable(default=False) -simpleRSS.keep_running = ConfigEnableDisable(default=True) +simpleRSS.autostart = ConfigOnOff(default=False) +simpleRSS.keep_running = ConfigOnOff(default=True) simpleRSS.feed = ConfigSubList() i = 0 while i < simpleRSS.feedcount.value: s = ConfigSubsection() s.uri = ConfigText(default="http://", fixed_size=False) - s.autoupdate = ConfigEnableDisable(default=True) + s.autoupdate = ConfigOnOff(default=True) simpleRSS.feed.append(s) i += 1 del s diff --git a/startuptostandby/src/plugin.py b/startuptostandby/src/plugin.py index 177e9b50..7843e490 100644 --- a/startuptostandby/src/plugin.py +++ b/startuptostandby/src/plugin.py @@ -1,12 +1,12 @@ # -*- coding: iso-8859-1 -*- from Plugins.Plugin import PluginDescriptor -from Components.config import config, ConfigSubsection, ConfigEnableDisable +from Components.config import config, ConfigSubsection, ConfigOnOff from Screens.Standby import Standby, inStandby from StartupToStandbyConfiguration import StartupToStandbyConfiguration from Tools import Notifications config.plugins.startuptostandby = ConfigSubsection() -config.plugins.startuptostandby.enabled = ConfigEnableDisable(default = False) +config.plugins.startuptostandby.enabled = ConfigOnOff(default = False) def main(session, **kwargs): print "[StartupToStandby] Open Config Screen" diff --git a/teletext/src/plugin.py b/teletext/src/plugin.py index 104f882d..94df960c 100644 --- a/teletext/src/plugin.py +++ b/teletext/src/plugin.py @@ -12,7 +12,7 @@ from Components.Label import Label from Components.MenuList import MenuList from Components.Pixmap import Pixmap from Components.ServiceEventTracker import ServiceEventTracker -from Components.config import config, configfile, getConfigListEntry, ConfigSubsection, ConfigEnableDisable, ConfigSlider, ConfigSelection, ConfigSequence +from Components.config import config, configfile, getConfigListEntry, ConfigSubsection, ConfigOnOff, ConfigSlider, ConfigSelection, ConfigSequence from GlobalActions import globalActionMap from Plugins.Plugin import PluginDescriptor from Plugins.SystemPlugins.Toolkit.NTIVirtualKeyBoard import NTIVirtualKeyBoard @@ -106,17 +106,17 @@ config.plugins.TeleText.scale_filter_zoom = ConfigSelection(filterList, default= config.plugins.TeleText.brightness = ConfigSlider(default=8, increment=1, limits=(0,15)) config.plugins.TeleText.contrast = ConfigSlider(default=12, increment=1, limits=(0,15)) config.plugins.TeleText.transparency = ConfigSlider(default=8, increment=1, limits=(0,15)) -config.plugins.TeleText.edge_cut = ConfigEnableDisable(default=False) +config.plugins.TeleText.edge_cut = ConfigOnOff(default=False) config.plugins.TeleText.splitting_mode = ConfigSelection(splittingModeList, default=SPLIT_MODE_PAT) config.plugins.TeleText.textlevel = ConfigSelection(textlevelModeList, default="2") config.plugins.TeleText.region = ConfigSelection(regionList, default="16") -config.plugins.TeleText.debug = ConfigEnableDisable(default=False) +config.plugins.TeleText.debug = ConfigOnOff(default=False) config.plugins.TeleText.pos = ConfigSequence(default=[DEF_LEFT, DEF_TOP, DEF_RIGHT, DEF_BOTTOM], seperator = ",", limits = [(0,dsk_width>>3),(0,dsk_height>>3),(dsk_width-(dsk_width>>3),dsk_width),(dsk_height-(dsk_height>>3),dsk_height)]) config.plugins.TeleText.tip_pos = ConfigSequence(default=[(dsk_width>>1)+(dsk_width>>2), (dsk_height>>1)+(dsk_height>>2), dsk_width, dsk_height], seperator = ",", limits = [(0,dsk_width-MIN_W),(0,dsk_height-MIN_H),(MIN_W,dsk_width),(MIN_H,dsk_height)]) # state -config.plugins.TeleText.textOnly = ConfigEnableDisable(default=True) -config.plugins.TeleText.opaque = ConfigEnableDisable(default=False) -config.plugins.TeleText.background_caching = ConfigEnableDisable(default=True) +config.plugins.TeleText.textOnly = ConfigOnOff(default=True) +config.plugins.TeleText.opaque = ConfigOnOff(default=False) +config.plugins.TeleText.background_caching = ConfigOnOff(default=True) # global functions diff --git a/webinterface/src/plugin.py b/webinterface/src/plugin.py index 813ae940..ea4a0481 100644 --- a/webinterface/src/plugin.py +++ b/webinterface/src/plugin.py @@ -3,7 +3,7 @@ Version = '$Header$'; from enigma import eConsoleAppContainer, eTPM from Plugins.Plugin import PluginDescriptor -from Components.config import config, ConfigBoolean, ConfigSubsection, ConfigInteger, ConfigYesNo, ConfigText, ConfigEnableDisable +from Components.config import config, ConfigBoolean, ConfigSubsection, ConfigInteger, ConfigYesNo, ConfigText, ConfigOnOff from Screens.MessageBox import MessageBox from WebIfConfig import WebIfConfigScreen from WebChilds.Toplevel import getToplevel @@ -54,8 +54,8 @@ config.plugins.Webinterface.https.auth = ConfigYesNo(default=True) config.plugins.Webinterface.streamauth = ConfigYesNo(default=False) -config.plugins.Webinterface.anti_hijack = ConfigEnableDisable(default=False) -config.plugins.Webinterface.extended_security = ConfigEnableDisable(default=False) +config.plugins.Webinterface.anti_hijack = ConfigOnOff(default=False) +config.plugins.Webinterface.extended_security = ConfigOnOff(default=False) global running_defered, waiting_shutdown, toplevel -- 2.20.1